Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable linkcheck after moving std #74861

Merged
merged 2 commits into from
Jul 28, 2020
Merged

Re-enable linkcheck after moving std #74861

merged 2 commits into from
Jul 28, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Jul 28, 2020 •
edited by Mark-Simulacrum
Loading

No description provided.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2020
@mark-i-m mark-i-m changed the title Reenable tests after moving std [WIP] Reenable tests after moving std Jul 28, 2020
@Mark-Simulacrum
Copy link
Member

@mark-i-m Are you planning on fixing the tests here? I'm working on local builds of this currently to try and push patches

@Mark-Simulacrum
Copy link
Member

Pushed a commit which passes linkcheck for me locally.

@Mark-Simulacrum Mark-Simulacrum marked this pull request as ready for review July 28, 2020 13:53
@Mark-Simulacrum Mark-Simulacrum changed the title [WIP] Reenable tests after moving std Re-enable linkcheck after moving std Jul 28, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

This re-enables testing so we should land it as quickly as possible.

@bors
Copy link
Contributor

bors commented Jul 28, 2020

📌 Commit c71ef626972adee385c96e567c8f4a7863450464 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout mv-std-followup (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self mv-std-followup --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging src/bootstrap/builder/tests.rs
CONFLICT (content): Merge conflict in src/bootstrap/builder/tests.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

☔ The latest upstream changes (presumably #73964) made this pull request unmergeable. Please resolve the merge conflicts.

@mark-i-m
Copy link
Member Author

Rebased. Should be ready for r+

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 28, 2020

📌 Commit 6726ca2 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

⌛ Testing commit 6726ca2 with merge 1d765131c1ae2cae6e9bc1e92372dd37133048cd...

@bors
Copy link
Contributor

bors commented Jul 28, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2020
@Mark-Simulacrum
Copy link
Member

@bors retry hopefully spurious?!

Assertion failed: (timeout != -1), function uv__io_poll, file ../deps/uv/src/unix/kqueue.c, line 231.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 28, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

⌛ Testing commit 6726ca2 with merge a7eff79...

@bors
Copy link
Contributor

bors commented Jul 28, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing a7eff79 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2020
@bors bors merged commit a7eff79 into rust-lang:master Jul 28, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.
5 participants
@mark-i-m @Mark-Simulacrum @bors @cuviper @rust-highfive